Skip to content

Preserve Git-tracked .atomicignore in shim projections - #339

Merged
vinceblock99 merged 3 commits into
atomicdotdev:devfrom
mrhinkle:fix/tracked-atomicignore
Nov 15, 2026
Merged

vinceblock99 merged 3 commits into
atomicdotdev:devfrom
mrhinkle:fix/tracked-atomicignore

Conversation

@mrhinkle

@mrhinkle mrhinkle commented Nov 15, 2026 •

Copy link
Copy Markdown
Contributor

Problem

A Git checkout with a tracked root .atomicignore imports successfully, but atomic git shim verify reports divergent manifest and index layers. On Atomic's own dev branch, the projected tree hash was exactly the Git tree hash with only .atomicignore omitted.

Change

  • Include the root .atomicignore in the shim conversion policy when Git HEAD tracks it. Preserve the existing private-file behavior for untracked copies and the independent vault policy.
  • Skip the post-import initialization record for a Git-tracked .atomicignore.
  • Exercise both streaming and ordinary import through the CLI. The regression checks shim verification, unchanged Git HEAD, tracked status, exact file bytes, and a clean working tree.

Verification

  • On macOS arm64 with Rust 1.98.0, ran the new regression against the released v0.22.1 binary and a local patched build. The release failed at shim verification with divergent manifest and index layers. The patched build passed both import modes.
  • Verified the patched build against the existing import and a separate fresh streaming import of upstream dev at 057c2225f7b2. The fresh import covered all 292 first-parent commits. Both verifier runs exited 0. Atomic's projected tree, Git HEAD, and the Git index agreed on d0ce8b026d4026180e322a3f27160570c9d9378a, with .atomicignore still tracked and a clean worktree.
  • Verified that both import modes still pass when .atomicignore is local and untracked. The fresh full import continued to report 12 skipped old tags without verified state bindings.

Follow-up verification

  • All five tests in git_shim_branch_reconcile_regression passed at head 6a42921 on macOS arm64 with Rust 1.98.0. Command: cargo test --locked -p atomic-cli --test it git_shim_branch_reconcile_regression::.
  • An independent Claude Sonnet review of the diff at 6a42921 found no blocking issues. The reviewer inspected the diff and verification evidence and did not execute tests. The follow-up source comment explains that the vault policy is persisted and the ignore-file policy follows Git HEAD.
  • Additional local fixtures verified a Git-tracked vault while removing and re-adding .atomicignore across commits, and promotion of an existing private ignore file to a Git-tracked file. Each reconcile and verify preserved Git HEAD and left the checkout clean.
  • GitHub Actions reported action_required with zero jobs on the current PR run. Could a maintainer approve the fork workflow so the upstream checks can run?

Signed-off-by: Mark Hinkle <mrhinkle@peripety.com>
Agent-Vendor: codex
Signed-off-by: Mark Hinkle <mrhinkle@peripety.com>
Agent-Vendor: codex
Signed-off-by: Mark Hinkle <mrhinkle@peripety.com>
Agent-Vendor: codex
@vinceblock99

Copy link
Copy Markdown
Contributor

Hi @mrhinkle, thanks for the fix. I reproduced the issue on 0.22.1 and confirmed the fix works.

@vinceblock99
vinceblock99 merged commit a6c3e35 into atomicdotdev:dev Nov 15, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants